Updated API + tests