Fixed client to support restructure