Update extension to fix issues in model