Fixing bad decorator definition
WIP with admin interface