[Release v0.1.86] Further abstraction