Update extension code and structure