Added some handy tools