extended model structure and fixed small bugs