Refactored model name
Added parser