Add comments and convenience functions