Added support for choosing the monitor type
Merge branch 'new_spec'