Added mapping of results