added extension infrastructure