More validation in activities