Seperated common and client sources