Revert "Use appropriate types"

This reverts commit 4bbd53172fd60e96d14b676bc5d136bb2d9e9792.
Revert "Revert "Use appropriate types""

This reverts commit 5c335b151566bfd3a0347575567fdde1eb89c6a2.