split blueprints handler into two classes