Placed WAPData class into separate file