Adding extra fields and functions @SoAndSo