More Features for the client!