Refactor code + Add proper float values support