Added basic manual support