Improve the sr810 class and script