Feature/updated reminder factory and integrate