Revert loading mechanism for nicer syntax