Updates to bring it inline with project dependancys