Added some instance typing