Implement #304, need to update fabric plugin so they're used