Update for new command / flag system (maybe)

Signed-off-by: DziNeIT <dzineit@live.co.uk>