Use properties and metadata wrappers more