Added specific type handling