Move resource age check to method and add safety for time