for now I think I will maintain this way, we probably need to think to change this to a better solution.