Add return type to apply methods, changed some to use Aux