Fix :: Resolves incorrect class creation while working with multiple entities