Some structural changes, added additional type safety - can lock out inherited objects.