Moved to recursive callback for layer handling