Replace customGetter with andThen