Design updated and regex input validation added