Fixed errors - now works with 'filestore' functionality