Revert "Remove class"

This reverts commit 382fca347d3111b950ee99e9de1d4be1a2518a12.
Remove clockwork