Core Controller re-added