Updated to interface split