Modified model for UI to work