refactoring for new system identifiers; fixed some bugs in types determination in builder