Added non-cash support