Added multi-position support