changed framework's model structure