Updated all custom features