Updated to new repo standard