Modify scheme load and cycle to use new filter methods