Improvements to assets rig. Closes #312.