Started moving repository features to an inherited template