Added new helper functions