Start to implement first stuff for JSR