Small changes
Added Statistics framework