Updates to elroy package.