Remove // TODO
Notify Observers after setting Entity