Fixed definitions location and loading