Fixed header + added more strict types.