Refactor on band model to fix pipeline hangup