Blueprints refactored