Improved extras handling.