addapta to crossdata packaging and exceptios change