adding initial extension support