Updated less structure