Fix: comments parsing
Fix composer stability