updated indentation and flow models/attributes