refactor: minor engine refactor and mixins support