imported files from client beta/0.4.0