Copule more source related modifications