Changed data types from strings to int

Change-Id: I8b5689d4f6cec544aaa431a4a23ff6b1542eccb4