Refactoring, partial vk template parsing