Refactored blueprint loader