Still working on Types package