Refactored extension options