[spear/executor] Now database structure corresponds the one described in docs.