Added custom controller support