Removed wrongly placed override
Added persistence contract and improved statistics