Improved model and implemented observable