Lots of changes for speeding up access.