Added Value retrieval to the API
Refactored naming