Bootstrap: started implementing generic types