Fixed issues with single table inheritance