Optimize Vector code + add render helper class