Extended API a bit