Added Entity base and standard main