Feature/robust reloader

@damianavila please review?