#156 adding missing fields