ODB: New feature enumerate singleton types

These is also one performance fix in singletons.