[#48] Maintenance update