Refactored callbacks signature