Added pimping for validation and better function aliasing