Improving extension behaviour