Added changes to accept extensions