Implemented own metadata sources (close #1)