Move some logic and variables to core controller