added documentation & parsing exception