Removed type parameter since that doesn't seem to be necessary