Simplified parsing. Added fix to prevent numeric attributes.