lollipops: Custom data support and bug fixes