Added alpha support