Custom properties (18/19)

Custom properties