Added Entitties and Core Functionality