Extend Core Controller