Adding proper VAO support