Given up on the direct type mapping - extending wrapper classes