active hash refactoring - api model done