Add some SG support