Updated usage with new options