VCL refactoring