UPDATE: Fixed API doc and removed redundant types