Added @Converts support