Fixed bug in step 2
Added standard type support in step 2