Added columns needed for associations