Fixes required fields, url map and removes debug prints