WIP - Custom handlers support