Made repo more portable