Commited re-implementation of the extension