Added strict function parameters for matra.