Added missing export
Added parsing
Code clean-up