Added an object store for better performance and a test plugin