Entity Id field name change and dependency framework improvement to get container anywhere