Add support for multiple L1AHandlers