Added support for single table inheritance