Added improvements