Add field collections and additional fields