CN-2: Added layers support