More Asset Pipeline refactoring