Added basic entity system