Core updates to helper functions