Refit to work with OctoberCMS