Added core controller functionality
Added core controller functionality