Adds more EClosure functionality