Final changes before associations