CN-26: Added layers support