Updated to use PublicConstants; Updated manifest