LAC-29: separating modules