Updated for Froxlor 0.9.29