Restructure corriente definition
callable and kwargs functionality delegate to class Entity