Rework. Add Function Call detection.