Improve acceleration scheme abstraction