Started redesigning Client property system