Added more assertions + removed parameterized key type from storage mangager #264