Some strictness annotations added