Extend with respect for undefined