Polish the design to be more generic (#184)

1 file changed