Added type field to entries and some TODO comments