Added new columns to models. Fixed relations