Use list
Move handlers to proxy