Added short code and default values
Comment addition