Fix use traits instead of static calls