Improved capifony support