Changed callbacks params
Added Action on init to easier imports