Move elb out as class