Moved loader handling to catalog