DEV: Change mutable object to mutable pointer