Added Commands and remove unused imports