Schema updated after issue # 27