Add command property to builders, remove constants