Change API log to using decorators
Resolve conflict before merging with logging