Add more actions and fix data types.