Removed default values and start to trust the API