-Add Blocks representation
-Implementation factory with singleton (not templated)