Switched to single table inheritance