Be more correct with reference types