Added todo's
Added support for 'auto' value