Libraries update, changes to controller for better IDE autocomplete