Added max length validation