Add admin + others features