Allow adding custom storage engines in a more flexible way