addition of CLI features