Some refactoring in SES part