Add some command and try to improve code