Commands structure somewhat added