CAPX-17 | Fixed callback functions and some bugs
CAPX-17 | Removed global variables for function params