Added CommandAdapter