Some changes.
Filter & Loader API ready.