Add more admin features to current models
Merge better admin config