Updated ctools and entity