Correctly set default values, type hints