- Added generic external layers support