Improve extension to use new coding guidelines and remove deprecated functions