Added features, improved memory caching