Add minors modifications