More API features + Streamlined code