Adapted API, included some ideas of OWNER.