Add extra space in case we need to add fields

Add extra space in case we need to add fields #1144