added entry objects and some more