Split interface implem into two file