Change way of setting default value