Just checking: do you have HandleBlocks and HasBlocks traits on your repository and model respectively?