Helper methods update