Adding more complex fields to models