Add real default values to prevent NullPointerExceptions