Added additional flags and behaviour.