Support NSNull and refactoring