Removing file dependency allowing for better instantiation