Change how extensions are added so they are more friendly with the generator