improved model, admin classes