Added model & admin changes from Efthimios