Added complete parse capabilities