Changed extensions to use undefined when not available