Adding a few features, oneWhere etc