Removing extend and ensure idProperty is cast correctly