Modified CadsrLoader.java class based on production code