added more context and field definitions #5 and #6