refactaring of manifest parser