Updated for Serviio 1.3