Updated callback and validation