Few updates and callback integration