Upgrade according to mayocat 0.10 +