Added support for custom repositories