Add mappers for byte and short