Made the fields a little more generic