Added flags and some command definition