Revamped command syntax