! Added pre-support for command lines