Change observableProperty for a more appropriate one