Minor changes to support the repository mode (#14)