Improve API, add ChatCommand injection