Rewrite to partially use feature loader