Static method for data
Added tests