Custom parsing added