Refactored callback extracting
Added new test clause. v0.8