Added Access Control Layer
Bug fixing