Modified existing SOS Observation model classes to fix the bug