Server functionallity added