Continuing to adjust features for clarity of API