Include parts count
Remove singleton pattern