Optimization + add skeleton for following changes : ability to handle
incoming data