More explicit type handling