Updates to make repository independent