Added basic type-checking for EPL