Fixed database.class error, minor members.class, added container.class