Optimistic locking is now an optional trait
No need to return
Moved reload method to trait
Fixed test