Initializer and model changes