Final changes to interface for client.