Added FCE support