Added the possibility to specify a custom folder under the bucket