Added support loaders and some helper classes