Add other fields #11