improved hooks
extension Cloud