Feature/better administration