Mango improvements

See commits description