Added new repo classes to publish
Cleanups