Added optional extensions