Added location and time creation parts