More method defs added + structural reconfig