I believe this will result in better API access. It may also fix the random NPE with metaData removal.