move some parsing to parsing section
refactor to support call_count