Added  support in loader