Update access permission and types
Updated test to support changes