Added validation/sanitization