Removed server static requirement
Merged changes