Client changes for integration with picasso