Added some abstraction to the lib