Some more goodies for SMF