Added  Server Side changes and related dependencies