Added CLI Table, disabled Tags due to error