Added things for extensions