Add CornerPin support