Changed command names and updated with options