Added isometric support