Improved Lotion.require and Lotion.resolve