Added dynamic loading from models