Abstracted code into single code base