Adding guard for development