Cleaned API. Added POD.