Fixed model binding issues