[WIP] update core geometric classes