Use immutable types instead of wrapper functions