step 0.6 - admin refactor