Move configuration to properties