Further solidify API