Temporary fork of goql with