Added doc blocks
Switched GetSet to twig