Re-enabled old entities and modified admin structure
Various changes