Changed some properties to float64 and int64 types
Moved functionality related to it to separate file