Added Common library and helper classes