Fix #103 Improve Simple Model