WIP - Adding usage on statistics