Added crud support for #603