Added Generic library to current code base