Added a few more hash-based dereferncing cases