Made improvments to the observer and datahandeler class