Readded SP3 functionality for backward compatibility