Changed input paramters parse method