Refactored for JSR specificy