Changes to default server system
Template updates