Added factory and ACL funtionality for the factory