Removed import statement to simplify the class generation
Added support for default value