Added basic entities, not finished yet