Removed memory leak on asprintf, added new types