Added generic parser