Updated to reflect current releases