Added support for subordinated entities.