Simplify library design