Added the main entity and some time management