Fixed type and added more the general use