HybridLayer and minor modifications