Added improvements to code base