Use resource loader#683#684

resolves #683
resolves #684