added shape and better capacity/changeRate support for storage engine
better support of min-take for swing options