Add clock type parameters to Buttons and PS2