Making it easier for Moksha