Added int & float types