Added similar director feature and corresponding tests