Add full SW inst functionality