Simplifying serialisation and adding more query restrictions.