Added new access checking