Added basic add support