ENH: Full cal support