Added int support