Add sp09 refactoring