Add more pseudo-functionality