Add shaking support