Initial changes for layer-specific filters (WIP)