Simplify some framework stuff