Add form attribute support