Added command entry point
Mid-refactor - revert point