Fix: Service Data Model (Year: byte? -> short?)