Adapt to properties instead of constructors

Change-Id: I1cca12260ba306f1b9aa4b387831955284df8f1c