Code updates

Moved static hash to class