Ideas for lib structure added