Added OPs and permission checks