Add more nice stuff