added implementation for creating entities and replaced broken portal
resolved merge conflicts