Cleanup, Added attribute bindings, Expose filter.