Changes in client and views implementations