Added wakabamark support