Added generic types to promises :)
Added promises to loaders