added entry resource
added missing fields an associations