Added some public helper functions