Move impl to handler