Extended the skeleton and argument parsing