Added util functions and loader