Finished support for both Integer and Double numbers