Added access controls