Schema updated after issue # 26

Schema updated after issue #26