Updated manifest and setup