Change properties to have decorators instead of wrapped methods