Updated Core for new Command structure