Make Command API extensible