Make the lib part of it less opinionated