Initial Version
Optimized utils and added access control