Basic updates & Templates system update