Add default behaviour for @repository, Cleanup