Added StringConstant and ClassConstant beans