Improve extension support