Updated mongoose & added improvement