Implementing support for better default values etc