Refactored source and group loading
Silenced compiler warning
Merged with origin