Removed dependendy on fs