Move method to interface
Better handling of empty data