FLOE-195: Replaced the direct markup manipulation with using a model and model listeners.