Configurable property keys. Improve Client init. Update tests