Change some helper method