Support functions moved to the right place
Missed dependency