Adding basic default logic