Changed model and admin accordingly