Add guards for public methods