improved database model and admin interface