Final changes to models