Moved implicit conversion to better place