Added basic command changed some structure