Change to resource form, closes #125