Update Database and cleaner, also add methods to Helper