Fixed attr and context parsing