Break dependency with package 'builder'