Added defaulting behaviour

Change-Id: I1878530a77f2a46085d305b3783d40fd43ae615c