Added two convenience functions