Add support for command line properties