0.4 commit with initial SP support