Added some member-classes