Data service fixed.
metadata fetching added.