Added ubuntu and server definitions