Feature/simple client check