Many improvements, added instances to ModelListing And ModelEditor fields