Added metastore Api
Changed metadata search return type
Fixed merge conflicts