added initial support for 1.1 beta 4