Some entities and basic logic added