Added suggestion by @detentor ar PR #6
Using new generic properties