CMOSD-475: Performance Issue due to many Embedded Tables