Moved validation logic to service driver