Moved here from the client repository